From: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
Date: Sat, 9 Aug 2014 15:03:11 +0000 (+0100)
Subject: location: Move settings to gsettings-desktop-schemas
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2259
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ce2c90a534d70d124651ce0a377ad028f383dd34;p=gnome-shell.git

location: Move settings to gsettings-desktop-schemas

Since these settings are now going to be accessed by
gnome-control-center as well, its more appropriate for them to live in
gsettings-desktop-schemas.

https://bugzilla.gnome.org/show_bug.cgi?id=734483
---

diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index f60772e5c..1274e989e 100644
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -74,7 +74,6 @@
     <child name="calendar" schema="org.gnome.shell.calendar"/>
     <child name="keybindings" schema="org.gnome.shell.keybindings"/>
     <child name="keyboard" schema="org.gnome.shell.keyboard"/>
-    <child name="location" schema="org.gnome.shell.location"/>
   </schema>
 
   <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
@@ -144,37 +143,6 @@
     </key>
   </schema>
 
-  <enum id="org.gnome.shell.geoclue.AccuracyLevel">
-    <value value="1" nick="country"/>
-    <value value="4" nick="city"/>
-    <value value="5" nick="neighborhood"/>
-    <value value="6" nick="street"/>
-    <value value="8" nick="exact"/>
-  </enum>
-  <schema id="org.gnome.shell.location"
-          path="/org/gnome/shell/location/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key type="b" name="enabled">
-      <default>true</default>
-      <_summary>Geolocation services are enabled.</_summary>
-      <_description>
-	If true, applications are allowed to access location information.
-      </_description>
-    </key>
-    <key name="max-accuracy-level" enum="org.gnome.shell.geoclue.AccuracyLevel">
-      <default>'exact'</default>
-      <_summary>The maximum accuracy level of location.</_summary>
-      <_description>
-        Configures the maximum level of location accuracy applications are
-        allowed to see. Valid options are 'country', 'city', 'neighborhood',
-        'street', and 'exact' (typically requires GPS receiver). Please keep in
-        mind that this only controls what GeoClue will allow applications to see
-        and they can find user's location on their own using network resources
-        (albeit with street-level accuracy at best).
-      </_description>
-    </key>
-  </schema>
-
   <schema id="org.gnome.shell.app-switcher"
           path="/org/gnome/shell/app-switcher/"
           gettext-domain="@GETTEXT_PACKAGE@">
diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index 7444ee767..052f77cc6 100644
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -9,7 +9,7 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Shell = imports.gi.Shell;
 
-const LOCATION_SCHEMA = 'org.gnome.shell.location';
+const LOCATION_SCHEMA = 'org.gnome.system.location';
 const MAX_ACCURACY_LEVEL = 'max-accuracy-level';
 const ENABLED = 'enabled';